Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 13 Mar 2012 19:51:39 +0000 (12:51 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 13 Mar 2012 19:51:39 +0000 (12:51 -0700)

Trivial merge